[libfsimage/zfs] compilation fix ZFS libfsimage support.
authorKeir Fraser <keir.fraser@citrix.com>
Fri, 2 May 2008 12:47:01 +0000 (13:47 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Fri, 2 May 2008 12:47:01 +0000 (13:47 +0100)
commitdf3a8c64343ff56f1d2588a21a4a566679fdc6d4
treeccd12609e27cfe344ab2455071254856a1e61e01
parentb2870e0a214f9c663c37992385a25011954828c6
[libfsimage/zfs] compilation fix ZFS libfsimage support.

Depending on environments, zfs libfsimage support doesn't compile.
This patch fixes it.

ia64-linux-gnu-gcc  -DPIC -O2 -fomit-frame-pointer
-fno-strict-aliasing -std=gnu99 -Wall -Wstrict-prototypes
-Wno-unused-value -Wdeclaration-after-statement
-I/usr/ia64-linux-gnu/
sys-root/usr/include -D__XEN_TOOLS__  -D_LARGEFILE_SOURCE
-D_LARGEFILE64_SOURCE  -I../../../tools/libfsimage/common/ -Werror
-Wp,-MD,.zfs_lzjb.opic.d -fPIC -c -o zfs_lzjb.opic zfs_
lzjb.c
In file included from fsys_zfs.h:41,
                 from zfs_lzjb.c:25:
zfs-include/zfs_acl.h:29: error: redefinition of typedef uid_t
/usr/ia64-linux-gnu/sys-root/usr/include/sys/types.h:82: error:
previous declaration of uid_t was here

This depends on how __uid_t is defined in the system header.
No file under the zfs directory uses uid_t so that just removing
the definition in the zfs_acl.h looks reasonable.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
tools/libfsimage/zfs/zfs-include/zfs_acl.h